added some search enhancements