Check if the fields are displayed
Restore the JSP key, too
gh-488