fixed tables controller and others