Change filter and fix scroll