Improved the Query Variable mode link parsing.