Correctly store data-url and correctly select for it

This also removes any lingering references to ```subPageUrlKey``` from the code.

Fixes gh-1383