Improve video form handler