prepareRow can't delete item from queue

Problem/Motivation

If the queue prepare row determines that processing is not necessary, it tries to delete the item from the queue but will fail because queue_name property is removed when preparing the hash and not added back before this check.

Proposed resolution

Shift the restore of the non field names above the check for needs processing