Fix bug where Organization search API didn't include ID