Fixed issue preventing class or id names with - from being parsed