Cleaned up issue filtering