Forms optimization
Forms optimization (bugfixes)