Latest changes from Frog + Bug fix on search toolbar