added map viewport checks and filtering