remove some duplication and make navigation filter apply to children as well