Changed filters to also search attribute names and values.