Use kwargs for shipping repository method calls

This is more likely to be backwards compatible.
Fix indentation bug in search form

Fixes #951