Properly reports server mode
Switch to XHR polling
With merge