#8 Searching works again