Tweak script, make it more general, add another query regex to kill, no longer kill locked