fixes for markup support