Refactor filter logic for greater clarity
refactor so that qf form is only rendered once
Move filter label setting to handler class