WIP - Normalize filter !

Change-Id: Icff72a19fcdec22018cdaa4094d7cebbc4bcc703