updated issue filtering code