#13 Add nullchecks to filters