Fix remaining bugs of mapping UI upgrade

Collect identified bugs as subtasks

(from redmine: issue id 399, created on 2018-01-22tgradl, closed on 2018-01-22)

• Relations:
  • relates #401 (closed)
  • duplicates #411