bugid-95218 | Top list fixing bug [second step]