The functionality I've been talking about has been added to the recent versions of QWP.
Since the version 5.4 is 4 versions older (the most recent version is 5.7) I'd suggest you to upgrade to a most recent version.
You can check out the release notes what has been fixed from one version to another, what new feature were added and you can download QWP for free and try your scenario before moving on with the migration.