Fix importing of URI keys, again
Add some form submission sanity checks