Encode search terms to prevent errors
Merge branch 'search'