[3.8] Fix #1659 reorder feature is broken for baskets & stories