Fix what.cd searching and sorting