code 21.6 for fix favorite and list activity