OpenLMIS integration bugfixes