Changes for prevent duplicate logic of "Do Show"/"Do Not Show"