Add the filter name to the filter layer or filter mask name

This restores functionality written by Melchior Franz in 2006 which
unaccountably got lost in the mists of time... From the code, it looks
like blockSignals hadn't been invented back then, so it's also a small
cleanup