make includes_table? a bit smarter