improved regexp but still need to check specification of characters that can be used in data-*