Refactor Search - no more hand-coded SQL queries!
Merge pull request #438 from shadlaws/fixes_20130628_2

Refactor Search - no more hand-coded SQL queries!