Updated filter to check for id == -1