Add precision on the way of filtering queries and corrected some typos. Change-Id: I8bd79539c895eee30fbd24ab869b596d9a1c82c1