Fixed some issue with json listing