Fixed searching of id