Filtering the groups with atleast one member. Branch based off master.

@akshar-raaj Please check it.