Add more filters, including regex