Fix #7 - DEFAULT_FILTER