Additional changes

Updated custom filters, etc.