Use the same regexp in the backend and the frontend
Merge branch 'master' into mongo_refacts