Fix - Filters are not applied on navigation through