EDDC-478 #time 20m Restructuring queries for Solr