Fix what.cd searching and sorting
Merge remote-tracking branch 'cohena/develop' into develop
Merge branch 'develop'