Fixes search form, let it use the super Form class
moved camelToUnderscore to Site
indentation