Choice fields in filters probably fixed