Fix redirect and typo in FilterExpressionObjectFactory

Fix too many redirects and typo in html

added 10 commits

• 3fae5fe1...7c59ef58 - 9 commits from branch development
• edb4286d - Fix merge conflicts

Compare with previous version

closed