Hey, I might get your difficulty. I may suggest you as a friend give a try to the wonderpush plugins. I assure you that they solve your issues.