[BUGFIX] Finish Search Implementation