Added * and ? search