Improve general selection
Improve log