Layout adjustment
Allow segment tags to end in either _id or _name