Added short discussion count switch for api call
Added discussion count switch and fixed merge conflicts