98 Corolla won't lock into Park

[EdW]

98 Corolla LE with auto trans. Been resisting going into park (where it actually clicks and locks), used to have to give the shift lever a bump forward as sometimes it wouldn't start due to the safety switch. Seems to be getting worse as I have to shift it to neutral to start it sometimes now as it won't go into park fully even with the bump, unless I'm on a hill and can get the car to move while I push the lever forward. I don't think it's the cable, seems to be something in the transmission itself.

Anyone have similar issues or can think of a fix I might try? Started using the E-brake as the car actually started rolling the other day when I thought it was in Park, making that clicking sound, not fully engaged in P. Didn't sound good. Thanks.