Completed sort by relevance, added some new options