Added another work around for the query variable issue.