Fix regression on modify child button. Always set to false
Add some functionalities