Fixed regexp's to correctly parse items with _'s in their names.