Feature/fix tagging

Fix tagging of completed instances