Fixed missing types in id query builder