Improving filters. Avoids NPE.