highlights are running :D
fixed sorting
fixed search
code cleaning