Add recursive scan for empty fields