Don't show City, State if one is missing
Merge remote-tracking branch 'origin/master'
Remove paginator if there are no results.