Fixed the search params identification part