MG Filter Dialog refactored