Report map location search fixes.
Merge remote-tracking branch 'origin/reports'