Moved search function to Dataclient