#540 shortening selects