Added additional search endpoints, code cleanup