PAHMA-1085: Changed field aliases in queries to comply with Solr field naming conventions