Tighten the GWS regexp. It was matching too much.