Ensure concept ids are passed when context is cleared