Fixed bug with double up handling
Made selection rules more consistent