fix content_or_options to be replaced by options and set to nil