Fix id not found error
Refactor feedback