Add a join query and fix ``id``/``uuid`` mix-up. Closes-Bug: #2093853 Change-Id: Ifc00069b075fed6bdf79bf4104cfdee62bb7b42a