Names filtering added.