Allow search to return matching category

Will be used by Cirrus.

Change-Id: I60e6b19d3b59ebf9bb45cc61d16936dfc7e4c708
Merge "Allow search to return matching category"