Fix for prefix/suffix at track level for dynamic queries.