Fixes for 2.1

We could avoid use of contains with this css selector:

    div.preview-gallery div.count-text

And something similar for the previous elements.