Made Q/columns top more intelligent