Fix http calls and controller