Fixing gear move within the same district when target server is not specified

 - Fixing gear move within the same district when target server is not specified
 - Fixes bug 953673
 - Fixes bug 953381