list display bug fix, corner cases..