Tweak Util.isBookshelfItem(...) for better flexibility