Adding flag handling in landing page