Added context
Lots of changes to make searches work and work better
Commits to fix tests