fixes for search
Merge branch 'master' of https://github.com/shergiggle/comp9321assi2
fixed dao