#930 and #929 fix browse issue