Add safe search; Add SearchProxy#query; Fix conditions using 'or'