Add check for empty fields in scaper/parser