fix forgotten fields on validation error
add rich snippets support