Re-apply modifications to use frange for facet queries in Solr for #1090

This reverts commit a6d901bdc47a7a91b34c2f28f595d52a33f0767c.
Fixes an issue inherent in #1090 where the frange plugin does not play nice with Solr fields that have a hyphen in the name