PLA-984 fixed namespaces filtering + code elegance