Fixed updating preview after base uri change
Merge branch 'change_base_uri_fix'