Fix sort on hash
Rough working prototype of highlighter in place