Fix filtering and make form sticky