cleanup and fix highlighting for aplus torrents