WIP on comparator validators
Fixed double extract validators