Hi Dariusz, 

Thank you for your feedback. 

Please check the newer version of this patch including the requested changes. 

Best regards, 

Khadem