Added server-side filter and in-place update