Move drinker-cups sort into db