Fixed filtering issues re-commit