Update shortcuts, refactoring QueryWidget