Add hall and room number tags

Also clean up some of the collating code