amazonchooser update for 2.0

needs more love with real tests
adapt linktrimmer for 2.0