Improve uri handling/browse