Fixed Issue #1357 - viB selects too much
Some code cleanup after helpful tips from Jared
Fixed failing integration test
Merge pull request #1475 from Mharlin/master

Fixed Issue #1357 - viB selects too much