Fixed bugs with separator tags for Gaby : )