Return to using a single tree
Updated tests for the term layer
Fix issue where searching was case sensitive