The sexy-ness is strong with this one.
Added even more stuff to the test scenario's which the search handles.
Merge branch 'dev' of https://github.com/waaghals/Tainted-Aberrant-Lion into dev