Moved filter queries to their respective modules.
Working on interfaces to different data products.
Merge branch 'master' into tracking

Conflicts:
	python/track.py