fix events misuse in database response