Fix the back URL by setting data-backurl on the div to the controller url then using that in the JS.
Merge remote-tracking branch 'origin/master'