Removed duplicate ID and fixed some validation erros