improve some hash expressions. Added filter in set