diff --git a/templates/hp_procurve_show_vlans.template b/templates/hp_procurve_show_vlans.template
index 0000531e57..23524275b6 100644
--- a/templates/hp_procurve_show_vlans.template
+++ b/templates/hp_procurve_show_vlans.template
@@ -1,5 +1,5 @@
 Value VLAN_ID (\d+)
-Value NAME ([\S+\s+].*(?=\|))
+Value NAME (.*?)
 Value STATUS (\S+)
 Value VOICE (Yes|No)
 Value JUMBO (Yes|No)
@@ -8,4 +8,6 @@ Start
   ^.*VLAN ID -> VLAN
 
 VLAN
-  ^\s+${VLAN_ID}\s+${NAME}\s+\|?\s?${STATUS}\s+${VOICE}\s+${JUMBO}? -> Record
+  ^\s+${VLAN_ID}\s+${NAME}\s+(\|\s+|)${STATUS}\s+${VOICE}(\s+${JUMBO}|)\s*$$ -> Record
+  ^\s+-+\s+-+\s+(\+\s+|)-+\s+-+(\s+-+|)\s*$$
+  ^.*$$ -> Error
\ No newline at end of file