improved regex-term