Added indication in database about origin of input data & improved the alert system