attribute search

Change-Id: I9638ca9ef325076122721c601aade05ce99c0c24
Merge "attribute search"
search: remove expr TODO

Change-Id: Iea7826f2924ad229585a1ec3921fceb6130e8207