Changed method to search by Id, design choice
Changed method to search by Id, design choice