Added query framework
Allows ++FILTER blocks