Use a better id for querying