Added highlighting and did some formatting for the client
Improved looping over the indexes