Why were we using a query string query here anyway?
Add test for datasource emptiness check
Merge branch 'fix_analyzers'

Conflicts:
	datasource_test.go