Update feature: Remove not needed internal check before redirect, added popup support