Hotfix smart list performance