- quick fix NPE in GeoConverter
- change search filter look and feel
Revert "- quick fix NPE in GeoConverter"

This reverts commit 2f5bfdc4c41b9469192a5ebdce81659d9c486a65.
- quick fix NPE in GeoConverter
- change search filter look and feel
(cherry picked from commit 2f5bfdc)
- quick fix NPE in GeoConverter
- change search filter look and feel
(cherry picked from commit 2f5bfdc)