changes to properly support facet_fieldname
changes to properly support facet_fieldname