Beats macro form data bugfix
Beats field validation done as deferred
Beats field extends refactored