@genie, this is a vague idea .. but you could change
On *:Text:*:#: {
to
On *:Text:*:?: {
No idea if that would work, though.