Merge ""Fix" search" into nyc-dev