Editing: QueueEntityResolver.php