corrected form data usage in entities