#16 home page layout #18/category page layout  - fixed queries