Pulling new search changes into firebase_testing

Griffin isn't all that dumb...we think