Fix the submission active/expired scopes, closing #1117.