Add with and without flavor filters, switch to lazy filtering to support multiple filters