Attempt to fix safari issue --fail, but should work.
Link fixes
Other form variables should update as well