Fix search error.

Change-Id: I8a2f990a64c38965b6a71cd7bc09f55d15165e09
More templates fixed.

Change-Id: Ie131dd12da0920a501cb9f07efa9ce33babe7b2b