Updates to search, and velocity-lib