fixed forms, added search