New search form, minor fixes