The table/view decision is now only made at the Archive level, so that it is consistent amongst all queries