Some tweeking to search