ExtendedSearch got better!