Fixing inital search bug from api_class change