Merge branch 'develop' into rematch

grails-app/services/au/org/ala/specieslist/QueryService.groovy

@@ -922,9 +922,11 @@ class QueryService {
  "${q ? 'and (sli.matchedName like :qMatchedName or sli.commonName like :qCommonName or sli.rawScientificName like :qRawScientificName) ' : ''} " +
  "group by sli.family order by cnt desc",
  queryParameters)
-// `if (commonResults.size() > 1) {
-// map["family_matched"] = commonResults
-// }`
+
+ if (commonResults.size() > 1) {
+ map[MATCHED_FAMILY] = commonResults
+ }
+
 
  //println(results)
  properties = results.findAll{ it[1] && it[1]?.length()<maxLengthForFacet }.groupBy { it[0] }.findAll{ it.value.size()>1}
@@ -948,7 +950,7 @@ class QueryService {
  'group by family order by cnt desc',
  queryParameters)
  if(commonResults.size() > 1) {
- map["family_matched"] = commonResults
+ map[MATCHED_FAMILY] = commonResults
  }
  }
  //if there was a facet included in the result we will need to divide the