Added filtering

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>
Removed redundant module entries

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>
Updated version of mata

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>