Added support for visibility and show / hide on combo change