Fixed: Filter lost with navigation