introduce filter query to filter out non-matching namespaces
move formulated query to abstract select and add required operator to queryclauses
Merge branch 'PLA-261' into dev