Made checks for use-filters and filter-query-template null-safe