Make data-load strings more robust (work on objects now)

Fix #556