* rework of Preposition management