Fix updated entities not being returned
Fix updated entities not being returned