Just a detail, I would move this after *notifyDataSetChanged*