Improve support for http to MR