Update 13

Search and Highlighting working!