eliminate bugs & filter search querys