fixed some remaining exceptions regarding sorting/searching