Some fixes in returning indexes JSON
Added indexes to stocks
Merge