remove 'percentage' filter
some code refactoring