add tables, missing m2m data and queries