Improved: search handling

To take benefit from new search capabilities (pagination)