Added span or and span term queries