Tweaks and updates to task/step tag numbers