Changed regexes, removed lists, restricted to trade channels