Attempting to fixbug where filtering only works as intended after pressing clear / select all