Waqas/for578 post selection broken span