update more facets haml for BL expectations; allow multiple group/container values