switch handle and enhance select list for rows