Fixed issue with not finding not null fields