I actually fixed the first problem by adding exactly the commands mentioned in the first problem but with no route-mark so basically they are duplicate but without the route-mark option ...
Only the second issue exists now ..
Tnx alot for your attention