fix find for not null fields