Updates for latest SearchEngine
Merge branch 'master' of github.com:knellr/StatusEngine