If we filter by portal_type, make sure those portal types are present
in the query, even if they would not appear in the navigation
Merge branch 'upstream-master'