automatically add all instances to suite entries

@dannyroberts with this change all instances are added to the entries automatically
Changed to `[\w\-:]+`