Schema changes, DRY search params