Bug fix #349: Limit Search Results

Bug review: http://mrccodereview.cloudapp.net/ui#review:id=1205 (approved)