Consolidated logic paths for creating a solr clause