merge of DB-HOT-559

Cache simpleSearchForm per terms

Fix issue with bootstrapMenuSimpleSearchForm too (same issue)