MapActivity bugfixing