[CORE-106] Finishing up search update