improve search by ID