update find method & include blank case