Jumping the gun on this change. We'll still need username search for Atlas