added error message for 404 error
adding tests for tab search along with various refactorings to
merging