Now supports function name filter