fixed checkbox toggle on map
Merge branch 'testing'
merge working testing branch