Updated search and suggest