Improve marcframe subject mappings