Fixes in servises and controllers2