Trim tag keys, and prevent duplicate tag keys (#2043)
Update regexp, and remove trim from old key..
Use match rather than split
Merge branch 'bhousel-bhousel-fields'