Fixed 404 headers. REF: #1620
Fixed display of option choices when editing an option that does not use choices.