Improve selector and markers