Tidy up property declarations in filter