Adding a default value to situation field on subscriptions
Minor fixes