bugfix: NoneType on cpe not matching regex fixed + making the regex match from start to end