[MapKit]: Added more conditions to check