Check split keys validity and fill in if necessary bug fixes