updated context filter