#679: #556: FR tag consistency G through M

opened by thuchacz