Fix syntax error and handling of modified/created subscription in relation to older subscriptions.