implementing dashboard filter -  TODO: fix