Changes to the query and updated to single index