fixed typo
moved search into optional fields