BDD Search: Add todo's
BDD Search: Remove comments field (deprecated)