1) fixed data "duplication" issues

2) queries are simpler / faster

3) now public & my data tabs