Add doctype
Highlight selected item
Improve selected item support