Fix a bug with setting clientSideStorage and focusOnLoad