Correctly store data-url and correctly select for it

This also removes any lingering references to ```subPageUrlKey``` from the code.

Fixes gh-1383
I have now modified convertUrlToDataUrl() to always decode. This fixes your concern here, and it also addresses the potential double-decoding problem.