Add comment search and search upgrades