[Fix] Fix issue which caused highlighting (as part of filtering) to not happen correctly.