rebuild on zendSearch branch