Attempt to fix issue #546 where Exceptions raised when options_filter is empty