More optimizations to enhance forms management.