Corrected variable names in display, display form.