Improving regex to prevent bypass of some shitters