User interface adjustments
Added _dodvisitor check for the NiprQuery method