Updated query to unify sections.
Added units filters