BZ-12621 fixed garden picker behavior