Fix staging url
Better way to index value