More steps for UAT1. 

Also enabling organization search as it is now fixed.