Browsing: Improve swing consistency