tweak list query logic
1.2.3