Fixed filtering by both tag and properties

Also fixed tests to pass