Add better checking for stops with brackets in their names