add unit id for query