Added an extra filter for making things work when multiple tags are used