Fix the subscription process (missing field in database)
Code cleaning