Clean-up Part 1

The FilterBox and QueryFilter are now totally ready to explain to the
teacher, still going on the rest