bug fixing + improved matches highlight