Added cleanup of search keywords