Context does not reference search
Merge pull request #411 from avit/cleanup-context-attr

Context does not reference search.