Refactor quote browsing a bit