Search Engine fixes