Fixes for filtering & add charity browse by type

Fixes for filtering charity & merchant locations with other taxonomies
set & add charity browse by time