Bugfix/vov 1817

This needs tests.  Capybara might be easier for integration tests. Thoughts?