Fixed filtering after switching theme