fixed tables to use the new views