Added code to the sql query for drinksearch instead of using a seperate view
Merged some conflics