Confusing SOLR results after upgrading from 4.10 to 7.1

[Hodder, Rick]

I upgraded from SOLR 4.10 to SOLR 7.1

In the core, I have a string field called "company" and string field "year", 
and I have an index on company called IDX_Company.
Here is the definition of the company field, and the definition of text_general 
in my schema in 4.10

    <field name="IDX_Company" type="text_general" indexed="true" stored="false" 
multiValued="true" />
    <field name="Company" type="string" indexed="true" stored="true"/>
    <copyField source="Company" dest="IDX_Company"/>
                <fieldType name="text_general" class="solr.TextField" 
positionIncrementGap="100">
                                <analyzer type="index">
                                                <tokenizer 
class="solr.StandardTokenizerFactory"/>
                                                <filter 
class="solr.EdgeNGramFilterFactory" minGramSize="1" maxGramSize="15" 
side="front"/>
                                                <filter 
class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
                                                <filter 
class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" 
expand="true"/>
                                                <filter 
class="solr.LowerCaseFilterFactory"/>
                                                <!-- strip all punctuation -->
            <filter class="solr.PatternReplaceFilterFactory" 
pattern="[^\p{L}\p{N} ]" replacement=" " replace="all" />
                                </analyzer>
                                <analyzer type="query">
                                                <tokenizer 
class="solr.StandardTokenizerFactory"/>
                                                <filter 
class="solr.EdgeNGramFilterFactory" minGramSize="1" maxGramSize="15" 
side="front"/>
                                                <filter 
class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
                                                <filter 
class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" 
expand="true"/>
                                                <filter 
class="solr.LowerCaseFilterFactory"/>
                                                                                
                <!-- strip all punctuation -->
            <filter class="solr.PatternReplaceFilterFactory" 
pattern="[^\p{L}\p{N} ]" replacement=" " replace="all" />
                                </analyzer>
                </fieldType>


Here is the field definition and definition of text_general in 7.10

    <field name="IDX_Company" type="text_general" indexed="true" stored="false" 
multiValued="true" />
    <field name="Company" type="string" indexed="true" stored="true"/>
    <copyField source="Company" dest="IDX_Company"/>
    <fieldType name="text_general" class="solr.TextField" 
positionIncrementGap="100" multiValued="true">
        <analyzer type="index">
        <tokenizer class="solr.StandardTokenizerFactory"/>
        <filter class="solr.EdgeNGramFilterFactory" minGramSize="1" 
maxGramSize="15"/>
        <filter class="solr.StopFilterFactory" ignoreCase="true" 
words="stopwords.txt" />
        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" 
ignoreCase="true" expand="false"/>
        <filter class="solr.FlattenGraphFilterFactory"/>
        <filter class="solr.LowerCaseFilterFactory"/>
        <!-- strip all punctuation -->
        <filter class="solr.PatternReplaceFilterFactory" pattern="[^\p{L}\p{N} 
]" replacement=" " replace="all" />
        </analyzer>
        <analyzer type="query">
        <tokenizer class="solr.StandardTokenizerFactory"/>
        <filter class="solr.EdgeNGramFilterFactory" minGramSize="1" 
maxGramSize="15"/>
        <filter class="solr.StopFilterFactory" ignoreCase="true" 
words="stopwords.txt" />
        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" 
ignoreCase="true" expand="false"/><filter 
class="solr.FlattenGraphFilterFactory"/>
        <filter class="solr.LowerCaseFilterFactory"/>
        <!-- strip all punctuation -->
        <filter class="solr.PatternReplaceFilterFactory" pattern="[^\p{L}\p{N} 
]" replacement=" " replace="all" />
        </analyzer>
    </fieldType>

Among the documents in the core are:

company                 year
AB Landscaping Inc.      2001
AB Landscaping Inc.      2002
AB Landscaping : AB Landscaping and Excavating LLC      2001
AB Landscaping : AB Landscaping and Excavating LLC      2002
A B Landscaping : AB Landscaping and Excavating LLC      2000
Landscaping Firm    1999
Landscaping Associates  1998

Under 4.10 if I search for
IDX_Company:(AB AND Landscaping)
I see all 7 companies, and the two AB Landscaping Incs are at the top of the 
results

Under 7.1 if I search for
IDX_Company:(AB AND Landscaping)

I only see the following, notice that documents with Excavating dont appear, 
and AB Landscapting are not at the top of the results - the Landscaping Firm 
and Landscaping Associates are

Landscaping Associates  1998
Landscaping Firm    1999
AB Landscaping Inc.      2001
AB Landscaping Inc.      2002

Any ideas that might be causing this? The query seems very straightforward.