Reworked searching should be far more powerful now.
Still working on indexing
Merge pull request #3 from Supernomad/QN-Indexing-Work

Qn indexing work