many fix after deploy + filter fix