Fix regexp to also find tracks like X/Y, etc