Fixed base url and header issues