timob-12176: Fix minor issues
Merge pull request #3998 from hieupham007/timob-12176

timob-12176: Fix minor list view issues