refactoring options_decorator. drop url check