Fixed sorts

Search might be broken
Merge remote-tracking branch 'origin/master'