Reinstate .includes when getting groupings