added filter queries
cleanup & added basic facet support