Fixed space issue
Added responses for teams and users