Fix comparators
Support for sub hash