The only wires that should be connected to a switch are the ones that are being switched. If there are more devices that are being fed down the line, they should be connected with a pigtail. Is that correct? If you want to use a push in terminal or a screw terminal on the new switch, use the screw one.
Let's Get It Fixed!
HomeX virtual experts will assess your issue (for free!) and can resolve simple problems.