This now works, need to do smarter thing for LIKE to get better results