Make character encoding section more generic
Fix filename markup