I think we should move this into ActiveFedora, rather than monkey patch it here.  I'm wondering if where_values (:q) and filter_values (:fq) can't be merged.