Finish the find functionality. (Corresponding UT cases are updated too.)