Fixed issues with local resource resolving not working properly

Main code rev. 1903