Feature/fix mapping radio buttons

Fix for https://www.pivotaltracker.com/story/show/71827784.