Move locale back into the Filters and defer the others