#20 remove need for save-match-data and fix the match for ftp