LDAP: Ordering fixes