more fixes for stupid WP automatic markup