improved default options handling