Add subqueries and filter data
Merge branch 'origin/Filter-lists'

Conflicts:
	www/js/main.js