Make validation work for all catalog submissions