Fix data form links
Attempt to fix issue #406