analytics fix, and auto map zoom