Fix popular tags (d.o. issue #2245715)