Some changes for the search project

These are some fixes related to the search functionality of parrot.