Fix AAE directory overload bug
Fix search service_available to return tuple