Add 'itemViewOptions' fallback for 'emptyViewOptions' + undo whitespace