fix collecting of controller cli commands