Removed some excessive logging
Fixed filtering