Made search "functional" again.