Added more parameters used to filter
Added regex flags to regex