added another fix for useId
fixing other issues