use regexp anchors to prevent false matches

Change-Id: Ib13b85986e3df431b0f900fea38165197411370e