Rev 22

Several fixes, unique and set items for trades lists