Id validation fixed