WLD Form Plugin modifications and fixes