Query layout tweak