Add amenity and shop tags to compound building kind

@rmarianski could you please check this out when you have some time?