Added index elimination for all query types.