Continued implementation of Search Tab