Fix issues with Searching