Tidy up property declartions in filter