Comment 5 for bug 839035

This is fixed now on master (branch1).

Maybe Chris should have a look: if there is a magical way to do this search directly from the catalog, without a sort() in the end, then it should be changed to the more effective way.