Minor changes on structure filter