navigation filter, refactor tests, unit tests