Move organization ORDER BY so that it actually works