Added ability to search for self, reduced timeout time to 30 minutes