Update recordset label when changing the filters
Remove some TODO notes

Remove two TODO notes as they have been dealt with by now.