Remove lat/lon fields, fix bug with map positioning