Allow multiple popups, remove empty body