Update row/columns selectors to functional form