Things to do:
   - Fix the attribite fliters as it was discussed

Change-Id: I008b6f98cdb96f718ceb68c1d32d81ae0101a8d5
Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>