fix deletion of timed out entries; add option to not delete tagged entries