Fix prefixes and suffixes for MLA; include changes in MLA-with-url