Fixed variable fields on frontend, closes #6868