Update ResultSet registration to be more consistent with Comparator