fixed issues with Organization query