Move select ability to base table