fix table names remove filters