Beautify Filter display

Signed-off-by: Sheik Hassan <solergiga@yahoo.com>
Merge pull request #601 from hassanNS/issue-110

Beautify Filter display