Moved section queries into own class and added frontage filters