Update database.rb

Modified a couple lines in find_candidates after running some tests in C# version.  Its better to filter, if emtpy, run places_by_city and then filter again.