Updated search and connection with Globals