Add `hideOnClick`, remove `preserve`, consider re-adding later