Category search
Change-Id: I7ff32c44210714a7dd092f201685fd2836405e32
Signed-off-by: Lisa Song <lisa.song@sap.com>