map interaction bugfixes