re-arrange some fields
remove hidden group=site value for search form