Keep OC7 compatibility for public galleries
Some cleanup