Updated search model
Merge branch 'master' of https://github.com/jbarrow/massive-wookie