Namespace typo fixes and subquery support with filters