Fixing issues with status setting. See https://magelliumltd.atlassian.net/browse/NGEO-1181