I've changed to shop=rental + rental=tools, seems better. I also think I might have been a little overzealous with the multipolygon here -- these properties are all part of MTR but they're not really all part of the shop. I'll check it out.