fixes #640 - Add management filters