More h-card fixes