Added empty listview support