backport bug fix from 017e86a9ab7c7f4af883fae275dee6e485e0db35

Backporting a bug fix from the new version to v2.1 so we can use it in a Blacklight 4 website