implementing expression models
Merge branch 'question-expression-design' into question-expression-design2
search to include all models without namespace
fixed master branch merge