Added external lengths (check query continue)