Fix payment uri handling

Closes #1551