Rearranging unless blocks

Trying to pre-empt space added by span tags at the end of filter groups