Small optimisation to tag parsing, means module version is queries for each pass