improved map functionality and filtering