added waits to select_from, select_row_from