Added activity == 1 condition on serviceById
Fixed Service delete