Fix filter block retrieving order