[softdeletable] Improved SQL query of timeAware option again