Added option to disable default view setting