*tested with wp 5.2, all ok
*tested with wp 5.5.3 and working great
*did some small modifications, works and tested