Fixes for context based look up.
Merge pull request #56 from sourishkrout/master

Fixes for context sensitive lookup; doesn't fix the UICatalog tests yet