Merge branch 'fix-selections' into gh-pages