Description
I've noticed that current eval regexp is too specific and only allow for a something like word1 or word1-word2 to be used as the component goal name. There are might be situation where goal has more then a single dash, e.g. word1-word2-word3
let's fix it