Restore groups json builders
Added groups to the patient views