Fix problem with name filter