Added general query buttons