Send nulls instead of empty strings to FinderAPI