QQWry: better handling for DataFileName