Finally got 4.12 here, and I am pleasantly surprised to see a sane (andsome would say) sensible right-click context menu in the query tool.
Good job devs.
rik.