Merging PR #140 Do not change a user defined display mode for elements, after show/hide