just some minor changes on the string used for map queries