simplify search query and add fields required for canonical link in search