Added filter for tags. Unfortch.