Reworking handling of conceptscheme_id.