wr1: Helps if I'm using the right query for the id I actually have.

Change-Id: I84fc1ac0b64d2192627ed0a1b41322a9071a9e6c