Multiple ids now handled correctly