feature/248/filterQuery



<!---
@huboard:{"order":62.3125,"milestone_order":249,"custom_state":""}
-->