Fix bug in indicator_data query
Fix js tests
Merge pull request #654 from benrudolph/master

Fix in indicator data query