Make filtering work and improve localized fields