Tweak handling listings