search control improved, directive removed \o/