moar tweaks, move search-form-generation to one function in central class