Added support for advanced string searching