Handle slugs in serving - this will need some fixing up at some point