Fixes in filter_conditions, null issue