Update suitable maps before selecting next/prev map
Update deprecated code
Fix waypoint icons where indexed by Gallery app on ICS devices