Various minor performance fixes for listing page