Backend and Frontend search changes