First work on improving filtering layou