1. Add list event to select query class
2. code refactored