Updates to sematic domain searching

Change-Id: I7e9385cb3322146c63f430a27d915f7e3b51368c