Search handling improvements