Added custom filter to resolve post display issue
Merge branch 'master' into Thanh