follow markup changes
fix variable name
fix obsolete selector
fix wrong breakpoint
version 6.38.1