Removed upcase + non-editable fields