Update data with more entity relations
Add LOS and ICLOD filters