fix sanitation issues, slight rework of repository attribute lookup