Added support for form-search and fix for other form types