Tidy up 'retag' operations

[ FIXED ]    Incorrect placement of 'retag' status information
[ UPDATED ]  New 'retag' logic into operations loop
[ REMOVED ]  Old 'retag' operation logic