Update search, so it works with the new after syntax.

Update search, so it works with the new after syntax. #1540