Removed attribute filters until they work