move to regex space check
More fixes