#95695 integrate neighbourhood tool with filters