Further code enhancement also for search ui from API