SCAL-512: more fixes in regexpes