Add clause in way filter to get faster