Improve editable concept computation