Correctly store data-url and correctly select for it

This also removes any lingering references to ```subPageUrlKey``` from the code.

Fixes gh-1383
No, because we stipulate that dataUrl must not contain a a uri-encoded string. So, when we retrieve the attribute value, we should be able to assume that it's not encoded. If it is, it's not our fault.