improve searching by id