Adding Full Featured Search