Made wildcard searches more general and other search fixes