Mob 2377

True, remember this story is not about refactoring entire map.js. I'm only touching the parts which were needed to complete the story. Your point is absolutely valid but I'd rather fix it together with filter box redesign so we do not introduce to many changes here. This pull request is already huge without them.