improved webhook validations