Updated concept view to work with expression instead of concept.