MODE-1916 - Fixed logic behind finding child node definitions.