code cleaned
interface query highlighting