CQM-153 Fix for cqapi whereis (again)