Fix hdx-ckan:#184,#185