I still think we should just remove queries which include the table name anywhere, instead of adding a lot of complex logic