Various fix: add owner_sid, multi-criteria for same column, etc.