Fixing filters behaviour according to analytics api