Improvements in Community services to be consistent with js version