safari state plugin improvement