Added searching by terms and codes back