Added support for single-column searching