Improved getFrameSearch and other minor changes.