Fix bug in indicator_data query
Fix js tests