Added block filter & collapse