adding Search endpoint support