SWAT fix for CirrusSearch

Change-Id: Id0afeb807f5b4403e79e75493ab7fb2ee40a7d19