Fix to VUFIND-980.
Improved namespace handling.