Fix ordering and selecting on different cols