Fix key check
Change to URI format