wottop and Ceiu 2231503: Add condition for index creation