fixed searching by ID