improve select (tbc)