fixed issues related to show removal