Improve Diagram Issues filter