PMO-2763 Fix log spam when searching with colons in term (like timestamps); plus minor groovy style impovement