Fixes for google map field