Fixed json_decode problem in list importing
Merge wit development