fixed NoSQL Json, thanks Alan
fixed mongodb issue 1401 and improvements, thanks Alan