Improve selector a little