Reworked validation to reference new tables and to include ranking observations