CON-23 | Collection navigation fix