Made comma in JS regex optional. Broke up long line in views import.