Fix Bug 883230 - Limit search size to 1000
Review changes