Fix for tabs and lag of the map