Bugfix: Autocomplete not setting value correctly

Stories: 
https://www.pivotaltracker.com/story/show/73115950
https://www.pivotaltracker.com/story/show/73115412
https://www.pivotaltracker.com/story/show/69346826