regex fix

modification of order for regex's used