Fixed some in geocoder.
categories step one
(cherry picked from commit d025cf8)
Merge remote-tracking branch 'origin/master'