Some refactoring done.

Category filtering works for all EXCEPT Offers