-change format json call
-add support for all single indicators