Fixed searching by id