LAI-1 small query clean-up