Update search, so it works with the new after syntax. (#456)

Update search, so it works with the new after syntax. (#456) #1796