Do not render building=supermarket special

This solves #520.

This is a rebase and correction of #550.