fix issues with move code for multiple haproxy cases

[merge]