Fix search field to keep term in the field
Fix search page pagination url