Fix issue with OEP tags not being selected