Yes, actually I have came to the same solution with attributeP (although I think I use there a different name, targetAttribute) in task/mongo_crud_location_attr (as you probably has realized after reviewing my last PR ;).