UC-138 Simplify the row selection