Rationalization of the code to handle search and other small changes
Rationalization of the code to handle search and other small changes

chrisstanford/persephone-darkside,chrisstanford/persephone-darkside,nepahwin/persephone,nepahwin/persephone