Vanilla fixes Oct 16

@hippee-lee 

Fixed search and added some minor features to Vanilla.