Add verify credentials and search. Clean up spec