Will fix chinooks not taking sub cells into account later

Was to fix #6068 & #4605, but that will be handled later.