1999 Jeep Grand Cherokee

I just recently did the bypass thing on relay for the fuel pump because 85 terminal is not getting power so its a short some were but its hooked straight to battery and works and runs fine. Now to run the fuel pump I have a switch to turn it on and off but when I shut the switch off and key it stays running and spits and sputters then finnaly shutsdown any way I can get it to just shut off with key like normal the wire I have running from the line on the fuel pump is in terminal 30 to make the pump run
October 3, 2012.

I am attaching the wiriing diagrams for the engine which has the fuel circuit including the relay. It will help you trace down the short or broken wire that you have.