Issue #408 - Fixing Senario
Merge branch 'C1_mohamedbassem_#14_filter_enhancements' of github.com:ndomar/megasoft-14 into C1_mohamedbassem_#14_filter_enhancements