Fixing colllection-select