Search - two changes

x