Name filtering implemented. Closes #602