Respect namespaces when searching

This means search results will appear in the correct namespaces now

Change-Id: I7fe24babf86bc7c983c02c290eb1863830ad7247
Merge "Respect namespaces when searching"