EDDC-154 Resolving issues related to more complex Solr queries