[IPHONEAPP-642] Refactored to improve consistency of tab selected to content in TableView/MapView