Edge case fixes
Cleanup
Merge branch 'develop' into usage-bugfixes
Fixed data query bug when zooming
Cleanup
Merge pull request #69 from haavardlian/usage-bugfixes

Usage bugfixes