Added fixes and form search