Added grammar based search