some fixes with routing