2i: Improvements in query/filter construction.