Fixed search block. Pagination still broke.
Continueed fixes, pagination still broke.
Merge pull request #390 from jobbrown/fix379

Partial fix for #379