[#3028] Some small tweaks to method logic for dashboard filtering