improved map markers management; fixed filtering bugs