some edit to util/forms