try harder to find unique ID, and validate it against QUUid.

Change-Id: Ic9cc84f3a14b62330c3fefc54e058142ab39e7df
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>