fix navigator filtering
8 files changed