[PLAT-4527] Added filtering for nulls.