Update HQFM2JS and HDS for better support for transfers