Improved mutation filter and added comments (related to issue 5586)