UP-3718 Work on queue