Fix issue with some tags not being found
Misc touchup as I work on the cron runner module