Update visibility conditions, avoid potential reload loop on xml build failure