Posible Final map query

This query could be the same as the secodn query of the home
Cordova to 2.7
Merge remote-tracking branch 'origin/arcayne'