adding base url and fixing do