Have you tried the Alexa Multi-Trigger mentioned above? I think it was intended to resolve these type of issues?