added or condition and renamed rtb tags