Fix to previous commit - only use search options if data attr was not present