Moved the hide method
Some refactoring and added filter to binding source