Integrate fixes for localized intelligent search by mlocati (https://github.com/mlocati/concrete5/commit/e9c6955c12079d15b7bf5bf7f44a699d1a0822ea)