Implements the new format for the build_solr_fq function