fix query tool navigation issues
weblinkbutton
more weblinkbutton