better regexp boundaries