VUFIND-422 fixes. Updated to be merged into master

Replaces #13