Add filter to be able to change the default, fixes #1263