remove option to show empty containers and start fixing failing cucumber scenarios