code refactoring + bugfix
proceeding click on selected column header will unselect