added search enhancements