Fixing the column query too