added filter groups support.
few comments.