switched updateMap to json dataType in order to retrieve additional information via JBuilder. Refactored geomarkerscontroller to work accordingly
addressed merge conflicts