fix specs part 2
refactor mapping controller. clear account field in new mapping form.