Highlighting problem fixed
No bug left with app