Revised input form and associated JQ