Fixed search with help from Josh L.
Merge branch 'workshops' into staging