I think you got what I suggested wrong. Please take a look at the latest beta. I believe it should address the most pressing issues: