Fix some bugs on FindWidget