Fix issue with showing and adding handler arguments