Fixed filtering bug - and zoom bug