Added more filtering for tags stuff.