fixes to pickuplist