improve form xml rendering