Fix #239 - Changed focus behavior and map "short" click listener (now ad...

...ded and removed reacting to events).