Improved Slandoua site handler.
Merge after pull conflict