LPS-34924 CustomSQLUtil.replaceOrderBy(...) doesn't handle ambiguous columns well