Simplification and fix for item selection using a mouse