Got tappedlist issue fixed, cleaned