Fixed ambiguous columns in order criteria