Fixes because of fs.ua markup change