Added filter to nullalize nullable value