fix filter
fix filter after search
fix indentation
Merge branch 'home_index' into home
commit made by hesham to integrate back to top.